From 64aa7239d16bcf06c948933cf8dcacc0ef1368b5 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 10 Jun 2010 08:31:36 +0100 Subject: [PATCH] x86_32 vmx: Fix build after msr cleanups Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmx.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b9e9b592bb..ae26706581 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -344,32 +344,28 @@ void vmx_save_host_msrs(void) {} #define vmx_save_guest_msrs(v) ((void)0) #define vmx_restore_guest_msrs(v) ((void)0) -static enum handler_return long_mode_do_msr_read(struct cpu_user_regs *regs) +static enum handler_return +long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) { - u64 msr_content = 0; struct vcpu *v = current; - switch ( regs->ecx ) + switch ( msr ) { case MSR_EFER: - msr_content = v->arch.hvm_vcpu.guest_efer; + *msr_content = v->arch.hvm_vcpu.guest_efer; break; default: return HNDL_unhandled; } - regs->eax = msr_content >> 0; - regs->edx = msr_content >> 32; - return HNDL_done; } -static enum handler_return long_mode_do_msr_write(struct cpu_user_regs *regs) +static enum handler_return +long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) { - u64 msr_content = regs->eax | ((u64)regs->edx << 32); - - switch ( regs->ecx ) + switch ( msr ) { case MSR_EFER: if ( hvm_set_efer(msr_content) ) -- 2.30.2